From: Florian Müllner <fmuellner@gnome.org>
Date: Fri, 8 Sep 2017 10:13:48 +0000 (+0200)
Subject: dateMenu: Adjust to GWeather IAPI change
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~63
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=56f4ce37cd52817a5fcba360dc5eec23d81656f0;p=gnome-shell.git

dateMenu: Adjust to GWeather IAPI change

It's not exactly clear what changed - gobject-introspection, gjs - but
the newly added gweather_condition_to_string_full() API no longer works
like it used to. The replacement code does look more idiomatic anyway,
so just fix the code without investigating the reason of the breakage.

https://bugzilla.gnome.org/show_bug.cgi?id=787423
---

diff --git a/js/ui/dateMenu.js b/js/ui/dateMenu.js
index 18f2f0e6b..0054f2d02 100644
--- a/js/ui/dateMenu.js
+++ b/js/ui/dateMenu.js
@@ -237,12 +237,12 @@ var WeatherSection = new Lang.Class({
         let options = capitalize ? GWeather.FormatOptions.SENTENCE_CAPITALIZATION
                                  : GWeather.FormatOptions.NO_CAPITALIZATION;
 
-        let [ok, phenom, qualifier] = info.get_value_conditions();
+        let [ok, phenomenon, qualifier] = info.get_value_conditions();
         if (ok)
-            return GWeather.conditions_to_string_full(phenom, qualifier, options);
+            return new GWeather.Conditions({ phenomenon, qualifier}).to_string_full(options);
 
         let [, sky] = info.get_value_sky();
-        return GWeather.sky_to_string_full(sky, options);
+        return GWeather.Sky.to_string_full(sky, options);
     },
 
     _sameSummary: function(info1, info2) {